Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adds support for apache2 binary path on debian #43

Merged
merged 1 commit into from Jun 9, 2015
+5 −3
Merged

adds support for apache2 binary path on debian #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 rawx-apache2/src/tests/test_rawx.py
View file
Open in desktop
@@ -14,7 +14,7 @@
import binascii
import re

httpd_binary = '/usr/sbin/httpd'
httpd_binary = '/usr/sbin/httpd' if os.path.exists('/usr/sbin/httpd') else '/usr/sbin/apache2'
namespace = 'DEVREMI'
rawx_module = '/home/fr19895/src/autotools/rawx-apache2/src/.libs/mod_dav_rawx.so'
rawx_url = ("127.0.0.1", "65535")
6 tools/sds-bootstrap.py
View file
Open in desktop
@@ -407,7 +407,7 @@
template_gridinit_rawx = """
[Service.${NS}-${SRVTYPE}-${SRVNUM}]
group=${NS},localhost,${SRVTYPE}
command=${EXE_PREFIX}-svc-monitor -s SDS,${NS},${SRVTYPE},${SRVNUM} -p 1 -m '${EXE_PREFIX}-rawx-monitor.py' -i '${NS}|${SRVTYPE}|${IP}:${PORT}' -c '/usr/sbin/httpd -D FOREGROUND -f ${CFGDIR}/${NS}-${SRVTYPE}-httpd-${SRVNUM}.conf'
command=${EXE_PREFIX}-svc-monitor -s SDS,${NS},${SRVTYPE},${SRVNUM} -p 1 -m '${EXE_PREFIX}-rawx-monitor.py' -i '${NS}|${SRVTYPE}|${IP}:${PORT}' -c '${HTTPD_BINARY} -D FOREGROUND -f ${CFGDIR}/${NS}-${SRVTYPE}-httpd-${SRVNUM}.conf'
enabled=true
start_at_boot=false
on_die=respawn
@@ -452,6 +452,7 @@
LIBDIR = CODEDIR + '/@LD_LIBDIR@'
PATH = HOME+"/.local/bin:@CMAKE_INSTALL_PREFIX@/bin"
port = 6000
HTTPD_BINARY = '/usr/sbin/httpd' if os.path.exists('/usr/sbin/httpd') else '/usr/sbin/apache2'

def mkdir_noerror (d):
try:
@@ -520,7 +521,8 @@ def getint(v,default):
UID=str(os.geteuid()), GID=str(os.getgid()), USER=str(pwd.getpwuid(os.getuid()).pw_name),
VERSIONING=versioning, STGPOL=stgpol,
M2_REPLICAS=meta2_replicas, M2_DISTANCE=str(1),
SQLX_REPLICAS=sqlx_replicas, SQLX_DISTANCE=str(1))
SQLX_REPLICAS=sqlx_replicas, SQLX_DISTANCE=str(1),
HTTPD_BINARY=HTTPD_BINARY)
if options.NO_ZOOKEEPER is not None:
env['NOZK'] = '#'
else: